Fix bug 344518

diff --git a/ChangeLog b/ChangeLog
index 00f7c5046d6eb5646e5bde3c2bd87188e42768e9..4cdf3ddbe8656d7e77f13647feb99001f57eb6b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-06-10  Matthias Clasen <mclasen@redhat.com>
 
+       * gtk/gtkprintoperation-unix.c (page_setup_data_free):
+       Check if rdata->page_setup is set before unreffing it. 
+       (#344518, Christian Persch)
+
        * gtk/gtkprintoperation.h: Remove an extra comma.  (#344528, 
        Elijah Newren)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 00f7c5046d6eb5646e5bde3c2bd87188e42768e9..4cdf3ddbe8656d7e77f13647feb99001f57eb6b7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2006-06-10  Matthias Clasen <mclasen@redhat.com>
 
+       * gtk/gtkprintoperation-unix.c (page_setup_data_free):
+       Check if rdata->page_setup is set before unreffing it. 
+       (#344518, Christian Persch)
+
        * gtk/gtkprintoperation.h: Remove an extra comma.  (#344528, 
        Elijah Newren)
 

diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c
index 4eb81c097bebbf652b79f0372e7cd6fa293e7734..15338564a0ff411f7f67793a9e2b7c286ccdb8bb 100644 (file)
--- a/gtk/gtkprintoperation-unix.c
+++ b/gtk/gtkprintoperation-unix.c
@@ -693,7 +693,9 @@ page_setup_data_free (gpointer data)
 {
   PageSetupResponseData *rdata = data;
 
-  g_object_unref (rdata->page_setup);
+  if (rdata->page_setup)
+    g_object_unref (rdata->page_setup);
+
   g_free (rdata);
 }